From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 3 Sep 2011 05:23:56 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~845^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7365023b449c0dcb5eca6afc64b2feb5e578f6a0;p=emacs.git

Merge from trunk.
---

7365023b449c0dcb5eca6afc64b2feb5e578f6a0